fix(session): merge per-call tool rules into session permission by remorses · Pull Request #30529 · anomalyco/opencode

remorses · 2026-06-03T08:36:09Z

Issue for this PR

Type of change

Bug fix

What does this PR do?

When a parent session has an external_directory allow rule (or any other session-level rule beyond plain tool denies), dispatching a subtask through the task tool produces a child session whose permission ruleset is missing those inherited rules. The subagent then asks for permission to read a directory the parent had already approved.

The child session is in fact created correctly. deriveSubagentSessionPermission produces the right rules and sessions.create persists them. The damage happens immediately afterwards in SessionPrompt.prompt: it sees tools: { task: false, todowrite: false } from the task tool, builds [task deny, todowrite deny], and writes that to session.permission via setPermission. setPermission replaces the row, so the inherited external_directory allow is dropped.

Fix is a one-line semantic change: merge the per-call tool rules on top of the existing session.permission instead of replacing it. Permission.evaluate uses findLast, so the appended tool denies still take effect for their targets, while previously-set rules survive.

How did you verify your code works?

Reproduced the bug end-to-end against a local server via the SDK before and after the fix.
Two new unit tests on SessionPrompt.prompt (with and without tools) pin the merge/preserve contract.
One new integration test runs the real task tool path through prompt.loop with a subtask part and asserts the child session inherits the parent's external_directory allow. All three fail on dev without the change and pass with it.
bun typecheck is clean.

Checklist

I have tested my changes locally
I have not included unrelated changes in this PR

SessionPrompt.prompt was overwriting `session.permission` with the per-call tool rules derived from `input.tools`, which clobbered rules the session already had. For subagent sessions this dropped inherited rules such as `external_directory` allows that the task tool had just written via `deriveSubagentSessionPermission`, forcing the subagent to re-ask for permissions the parent had already granted. Merge the per-call tool rules on top of the existing session permission instead of replacing it. Last-write-wins evaluation still lets the tool denies take effect for the rules they target. Add two unit tests for the merge/preserve contract on `SessionPrompt.prompt` plus an integration test that runs the real task tool path through `prompt.loop` with a `subtask` part and asserts the child session inherits the parent's `external_directory` allow. Fixes anomalyco#30527 Session: ses_17620c6c8ffe1JD8hmnPl15UUd

github-actions · 2026-06-03T08:40:07Z

The following comment was made by an LLM, it may be inaccurate:

Based on my search, I found one related PR that addresses a similar issue:

PR #30288: fix(opencode): inherit MCP tool allow permissions in subagent sessions

fix(opencode): inherit MCP tool allow permissions in subagent sessions #30288
This PR is directly related as it also deals with inheriting tool allow permissions in subagent sessions, which is the core issue your PR (30529) addresses. While it focuses on MCP tools specifically, both PRs tackle the inheritance problem where child sessions lose parent session permissions.

This appears to be the most relevant match, as both PRs address the broader problem of subagent sessions not properly inheriting parent session permission rules. The difference is scope: your PR provides a general fix to the merge logic in SessionPrompt.prompt, while #30288 may be more specific to MCP tool permissions.

Keep only the integration test that exercises the real task tool path via prompt.loop and asserts the child subagent inherits the parent session's external_directory allow. The two unit tests on SessionPrompt.prompt were redundant with this end-to-end coverage. Session: ses_17620c6c8ffe1JD8hmnPl15UUd

Session: ses_17620c6c8ffe1JD8hmnPl15UUd

…heritance

* test(core): cover skill directory output (anomalyco#31263) * fix(opencode): avoid duplicate skill catalog (anomalyco#31269) * chore(opencode): update MCP SDK to 1.29.0 (anomalyco#31268) * chore: generate * chore: update nix node_modules hashes * run: make minimal mode more minimal (anomalyco#31227) * chore: generate * chore: update web and desktop code owners (anomalyco#31289) * fix(desktop): few WSL bugs (anomalyco#31095) * chore: generate * fix(opencode): respect MCP server capabilities (anomalyco#31271) * console: update email * zen: fix * fix(opencode): include acp pending tool input (anomalyco#31321) * fix(lsp): resolve JDTLS root to topmost pom.xml in Java Maven multi-module projects (anomalyco#28761) Co-authored-by: Shoubhit Dash <shoubhit2005@gmail.com> * chore: generate * fix(session): merge per-call tool rules into session permission (anomalyco#30529) Co-authored-by: Simon Klee <hello@simonklee.dk> * docs(go): update MiniMax M3 pricing (anomalyco#31350) * fix: speed up fff file search (anomalyco#31366) * chore: generate * fix(stats): show new for leaderboard deltas * fix: stabilize fff file results (anomalyco#31369) * chore: generate * fix(core): restore npm proxy agent patch (anomalyco#31373) * chore: update nix node_modules hashes * chore: upgrade OpenTUI to v0.3.4 (anomalyco#31326) * chore: update nix node_modules hashes * fix(core): disable fff trace logs (anomalyco#31380) * fix(session): avoid sticky prompt tool overrides (anomalyco#31394) * fix(opencode): await run event loop (anomalyco#31389) * refactor(core): replace legacy logger with Effect logging (anomalyco#31310) * chore: generate * fix(tui): trim select footer action highlight (anomalyco#31411) * fix(opencode): support MiniMax M3 thinking toggle (anomalyco#31426) * fix: adjust item id stripping to happen prior to request signing (anomalyco#31429) * fix(opencode): generate reasoning variants for all OpenRouter models. (anomalyco#30332) Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> Co-authored-by: Aiden Cline <aidenpcline@gmail.com> * feat(app): add draft tab support to tabs store (anomalyco#31343) * chore: generate * fix(opencode): paginate MCP catalogs (anomalyco#31442) * fix(opencode): pass abort signal to MCP tool calls (anomalyco#31455) * feat(app): draft prompt state (anomalyco#31452) * chore: generate * feat(app): tabs help button (anomalyco#31454) * feat: add "reasoning" as interleaved field option for vLLM providers (anomalyco#30477) Co-authored-by: Ben Sandbrook <1126483+delta9000@users.noreply.github.com> Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> * fix(app): clip rounded session panels (anomalyco#31462) * core: fix idle CPU use in file logger (anomalyco#31478) * docs: add uninstall troubleshooting steps (anomalyco#31424) Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com> * leave a breadcrumb comment about batchWindow zero (anomalyco#31508) * chore: stats -> data * test(core): avoid Windows worker close race (anomalyco#31532) * refactor(tui): centralize application exit (anomalyco#31524) * chore: generate * feat(opencode): configure Cohere North model (anomalyco#31536) * refactor(core): consolidate references (anomalyco#31539) * feat(tui): show project copy in session list (anomalyco#31421) * chore: generate * fix(stats): use data branding assets * drop citation_options from cohere (anomalyco#31543) * zen: add north mini code model * fix(data): timestamp formatting * fix(opencode): support Claude Fable reasoning (anomalyco#31546) * fix(mcp): log actionable connection statuses (anomalyco#31544) * refactor(core): simplify location filesystem (anomalyco#31545) * chore: generate * chore: update nix node_modules hashes * fix(opencode): restore effect error logging (anomalyco#31551) * chore: generate * feat(opencode): add typed application layer graph (anomalyco#31531) * zen: add claude fable 5 * chore: generate * refactor(mcp): simplify service helpers (anomalyco#31549) * feat: add X-Session-Id header for proxy cache routing affinity (anomalyco#31511) * zen: update email * fix(desktop): update Electron stack and panel layout (anomalyco#31571) * chore: generate * chore: update nix node_modules hashes --------- Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com> Co-authored-by: Simon Klee <hello@simonklee.dk> Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com> Co-authored-by: Filip <34747899+neriousy@users.noreply.github.com> Co-authored-by: Frank <frank@anoma.ly> Co-authored-by: Shoubhit Dash <shoubhit2005@gmail.com> Co-authored-by: huangli <areyouok@gmail.com> Co-authored-by: Tommy D. Rossi <beats.by.morse@gmail.com> Co-authored-by: Jack <jack@anoma.ly> Co-authored-by: Adam <2363879+adamdotdevin@users.noreply.github.com> Co-authored-by: Dax <mail@thdxr.com> Co-authored-by: James Long <longster@gmail.com> Co-authored-by: Anthony Lau <anthony.lau2000@live.com> Co-authored-by: Aiden Cline <aidenpcline@gmail.com> Co-authored-by: Brendan Allan <14191578+Brendonovich@users.noreply.github.com> Co-authored-by: Ben Sandbrook <sandbrookvt@gmail.com> Co-authored-by: Ben Sandbrook <1126483+delta9000@users.noreply.github.com> Co-authored-by: opencode-agent[bot] <219766164+opencode-agent[bot]@users.noreply.github.com> Co-authored-by: Sebastian <hasta84@gmail.com> Co-authored-by: Songchao Wang <songchaow@outlook.com> Co-authored-by: yui-soul <yui-soul@users.noreply.github.com>

…alyco#30529) Co-authored-by: Simon Klee <hello@simonklee.dk>

github-actions Bot added the contributor label Jun 3, 2026

remorses added 2 commits June 3, 2026 14:45

test(session): drop comment from subagent permission test

fb02214

Session: ses_17620c6c8ffe1JD8hmnPl15UUd

remorses marked this pull request as ready for review June 3, 2026 12:54

remorses force-pushed the fix/subagent-external-directory-permission-inheritance branch from 5e592d0 to fb02214 Compare June 4, 2026 10:50

github-actions Bot mentioned this pull request Jun 5, 2026

docs(plan): サブエージェントの権限マージの修正計画を作成 #30845

Closed

6 tasks

remorses and others added 2 commits June 5, 2026 09:15

Merge branch 'dev' into fix/subagent-external-directory-permission-in…

4482dde

…heritance

Merge branch 'dev' into fix/subagent-external-directory-permission-in…

8f1953c

…heritance

nexxeln merged commit 0050134 into anomalyco:dev Jun 8, 2026
7 of 8 checks passed

nexxeln mentioned this pull request Jun 8, 2026

fix(session): avoid sticky prompt tool overrides #31394

Merged

avion23 pushed a commit to avion23/opencode that referenced this pull request Jun 10, 2026

fix(session): merge per-call tool rules into session permission (anom…

428c4d8

…alyco#30529) Co-authored-by: Simon Klee <hello@simonklee.dk>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(session): merge per-call tool rules into session permission#30529

fix(session): merge per-call tool rules into session permission#30529
nexxeln merged 5 commits into
anomalyco:devfrom
remorses:fix/subagent-external-directory-permission-inheritance

remorses commented Jun 3, 2026

Uh oh!

github-actions Bot commented Jun 3, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

remorses commented Jun 3, 2026

Issue for this PR

Type of change

What does this PR do?

How did you verify your code works?

Checklist

Uh oh!

github-actions Bot commented Jun 3, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants